merge trunk
authorKenichi Handa <handa@etlken>
Thu, 8 Jul 2010 08:09:35 +0000 (17:09 +0900)
committerKenichi Handa <handa@etlken>
Thu, 8 Jul 2010 08:09:35 +0000 (17:09 +0900)
commit2863bbcf9636c9451b6424d554468c2ec1515743
treed929bb3edb0f477f36cef875b4db201b792a7485
parent8013a1ac9e0e67a5ae3b462216bde1641534514d
parentd5d2719bf0f47297d5fcf054d016c394caf265bf
merge trunk
src/font.c
src/font.h